Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 14 Apr 2012 06:38:33 +0000 (23:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 14 Apr 2012 06:38:33 +0000 (23:38 -0700)
commit348d1b5bcf8e75675f02ae2cf072ed9750595e9c
tree68b45446f99970e3f07ddd09b680669a2aa5f41b
parentb2b80c20c822762be1bce5b50f0e5913a006efd1
parente233a209f7f19607426fbbe3e9a7b4ad2389c9f1
Merge from trunk.
src/ChangeLog